bitkeeper revision 1.1389.5.39 (427fa2d9jE5TtbINdrPx7eZUBH6d3A)

Merge firebug.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc .rootkeys
index bacaf8b1737761995a2bedc2683103177f175e0b,c3afd372dd8c3cfb574a81ce8eef4266d60c644e..f74260440979fdb833525ca1aeef13d5f29313c3
--- 1/.rootkeys
--- 2/.rootkeys
+++ b/.rootkeys
@@@ -1412,7 -1430,8 +1433,9 @@@
  3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/public/xen.h
  3e397e66m2tO3s-J8Jnr7Ws_tGoPTg xen/include/xen/ac_timer.h
  40715b2epYl2jBbxzz9CI2rgIca7Zg xen/include/xen/acpi.h
 +422f0995xCgnbsVhTjSncnqIABs64g xen/include/xen/adv_sched_hist.h
+ 427fa2d1wyoVbvCyZRLposYjA_D_4g xen/include/xen/bitmap.h
+ 427fa2d1ItcC_yWuBUkhc7adedP5ow xen/include/xen/bitops.h
  3ddb79c0c0cX_DZE209-Bb-Rx1v-Aw xen/include/xen/cache.h
  41f2cea7Yna7xc0X9fyavIjoSFFeVg xen/include/xen/compile.h.in
  3f840f12CkbYSlwMrY2S11Mpyxg7Nw xen/include/xen/compiler.h